Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 06:45:13 +0000 (06:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 06:45:13 +0000 (06:45 +0000)

Trivial merge